Fixed issue with recent update