fixed bugs with singly