Fixed bug where app cannot distinguish between identical names