Smart first, Fixes #17