Removed redundant code of previous fix