spec update, code fix