[issue-425] Workaround for #425