Closed #115 (method 2)