Fixed issues for shammah