Fixed with @zaggino sugesttions