Change fix on initial load