Applies same fix that Fixed #78.