fixed bug
merge?