More work on #546
Fixed #290