Fixed part of #1, but still not initializing correctly