Fixed #85, Fixed #86, Fixed #87