fixed Krimdomu/Rex#292
merged