fixes work-in-progress