Fixed #558