working on #546