Pre-release 0.4 FIX