fix bug in initial form
Merge pull request #74 from fiery-skippers-2014/refactor

fix bug in initial form