Fixes #1 may need to revisit over 100