fixes #TYRUS-380