Final version - hopefuly fixed