Trying random stuff to fix #51