[#GD1] Fix for the bug done