Fixed an issue with init