getting ready to fix bug #301