Fixed #24