ugly fix?