Fix for initialize order