[FIX] fixed Hotfix/trac tickets

@meiers, @JohnReid this should fix the issues you've found.

Thx again.