Added fix for the error stuff for 0.6