Fixed Issue #60 (dirty code!)