Fixed: Bad logic | #RCMDS-3 Fixed