Best I can do to fix #745 for now.