Fixed #245