add specs and a fix