Fixes subject/object use