previous fix wasn't working - fixed for real