Fixed #523