Should be working as intended now