Hopefully fixing #8