Fixed #513