Fix useablility