Trying to fix e-bug