Solved issue #285