Added bug fix from V0.8 Beta 1.1