ninor bug fixing