possible elegant fix