Merge pull request #297 from MirServer/hackier_hack

Make hack more reliable