Added the correct return flags