modifies patch 36, adapts to version 1.5