Fixed issue #24