Attempt to solve #301
Merge commit '653f0243ad048ae2a5bfed51853cb0008641f5b0'