Missing a `return` here? Sorry, not checked the remainder of the code ;-)