Fixed first time use bug