changes to support Tyrus 1.5