fixed problem partially