Fixed issue with stopping instances