Fixed first time initialization bug (issue #1)