Moved setting earlier