fix #194
Merge commit '64376e9a3c48fb9579b150318ef9200f6f8499ad' into experimental