Fixed for latest incoming