Current version check was buggy, moved it to fix bug