Removed fix for issue #16 as it not was correct all times. Issue #17 solved this