#2 - Fixed the issue