*possible* fix for bugs #453 and #373