Fixed #24.