#2 added +bug