Bugfix for monkey

this is a Bugfix for monkey
confilcts

time to commit conflicts