fixed few :/