FIX: Component was not refreshing all the time