Fix for 1.0.5 and later.