Trying to fix #15