added OOB handling