Fixes #2 take 2