more baby steps towards fixing #550