Bugfix

	* Added support for bugfix
	* Fixed errors on init