Fixed #18