fixing a bit
merge