quick temporary fix for OOB in this method until we can pick it apart better