PLAT-528: Handling corner cases