Fixed #261