fixed overflow-s problem