instance handling fix