V1.0.6 Bug Fix