working on a fix for issue #521