Fixes #124. This time it should be completely solved.