Testing #307, seems to have been fixed?