FIXED: bug case