Removed unnecessary duplicate conditional from issue #6