fix regression from last one #24