Fixed #926 [gh#926]