Yet Another attempt to fix #151