Should fix #144 partially

The rest is due #139