Final fix: working finally