previous fix didnt seem to work