fixed bug in regular case