Fixed issue with  determination