Fix for corner case