Fixes #2042, fix specs