FIXED: bugs