HOTFIX 0.5.4BETA