Reinstate overwritten fix

Supports #314