Fixed for version 0.5