Fix for 0.4.10