Fixes

Fixed improper initialization due to bad execution order of the
constructors.