Make style a little less dangerous (Fixes #1)