more terrible fixes