Fixed support for overwriting with declared fields