Speed up - Fix conditions