try to handle new case without breaking anything