Improve instance propagation #272