Seems to Fix Issue #197