bugfixing 15.30-13-05