bug fixes related to #266