fixed multiple call error