Patched version 0.5.0.1