Tried to fix #59 again.