Fix for #275.
Merge pull request #276 from DLu/is_current_fix

Fix for #275.