Added little fix to make more secure the bugman fix