A fix and more ...