Subtle bug fixed