Hopefully fixing #4 v2