Little code update to be iPojo compliant