Place guard statement on top before swapping history
Release 0.9.2