Working around corner case