Fix for 0.4