Type Fix - SEE PREVIOUS SYNC FOR MORE INFO