Closes #623.. again.

#623