Temporarily fixes #19