Fixing per comments