possibly fixed bug