merge! fix and spec