(v.0.5.0.2) Small bug fix