removed redundant check breaking things