alternative fix for bug, to avoid more duplication