removed obj check condition as it was causing some trouble