shoukd work properly now