fixing: init
Merged
fix..