attempt one at bugfix for contract violation