fixed bugs with 18.