Fixes #1 - resolved