trying to fix this bug