Trying to fix #14