bugg fixing 16:27-13-05