Fix #85
Merge commit '2312a06be189a27b0cc998629aece48ebed0864d'