Fix #43 (possibly)