Fix #546