Issue 583 2

This is for #583