fixing specs and potential issue