Fixing design bug