Fix for #78.

Takes care of the comment in the respective discussion.