Fixed issue #12