Fixes on bug-fix

	* Improvements on pull-request