Patch v.1.0.4

[p]This patch has been rolled back! Sorry for anyone who experienced a crash due to it![/p]