Pre-release 0.5.4 FIX