Trying to work around model signal problem