Fixed issue #124 opened by mythicpencil.