Fixed issue concerning manual refresh when manually returning materials

Closes #609