fixing... a bit more