fixed stupid bug
merged