(might) fix #39