SSmall bug fixing