Fixed issue with last commit + optimization