Fixes issue 1 (resolve issue)