FIXED: minor bugs