This Fixes #3 issue