Effectively fix #2