Fixed 0.4.1 regression