Fixed SHM Bug