Final fix for incomingParams being undefined