another attempt to fix this bug