0.5.0.0 Fixed