Helps to fix #14