Possibly a temporarly solution to some bug