Added return statements to make hinter happy