Fixed issue #2724