Fixes spec tests
Release v2.0.18