Workaround for #109, #147
Merge commit '3d78a08b9f3307ac3874f5c120f7d4166c62efb9'