Added BUG. Merging this one.