Now fix via js