Moved one last thing around to match original js