1.0.0
Moved if check to right location