Follows minor fix #9