Fixed for version 0.7