fix last merge + make period optional