Bug fixed

@Aahung, sorry for the wash out..