common case fix