Fixed #578