Hot fix for 0.5.0