Fixed #18, Fixed #26