bug fixing!