Add broader specs and fix a bug pointed out by @schisamo