Undo '0.0.5_03' Changes fixing