BASIC-696: Fixed