Fix bug in if without else for storepassing