minor fix for special cases