Still a f***ing bugfix for #56