Fixed #515