working on #541