FIX: https://github.com/beetleskin/kleem/issues/29 + https://github.com/beetleskin/kleem/issues/28