Fixed a crash caused by a change to initialization order
Merge pull request #303 from peastman/master

Fixed a crash caused by a change to initialization order