workaround #618
Merge branch 'pr619'