Fix conditions bug; Prevent compiling with errors