Resolved issues 26-08-13