Fix #94 (hopefully)