Adds single device protection for issue #5.