fixed bugs with & and '