fixed bugs with Joy