Trying to solve the bug