FIXED #005, added #006