Fixed margin bug