Bug fix.
Design fix