Iss #77: Hotfix