Actually fix #268 this time..