Fixed #39