Fixed bug that occurs in SM 1.6