Addressed comments by @bnoordhuis