fixed desing issue