BASIC-805 fixed