fix #1 work done