Fixed #236