bug fixing iv idea
merge fix attempt