Changed positioning for better consistency