Trying to fix scroll bug