Hopefully fixing #4