fixing initial load behavior


@jancborchardt @Gomez