Fixed #598 part two