Fixes #1. Move solid outside of factory function.