Attempt to workaround #27.