Fixing the traps and their location
Merge branch 'hotfix/BUG_TRAPS'