Fixes #1 via Lineman update