fixed navstate checks