After fixing issue #1