Fixed #526