Fix #115 (In a roundabout way)