Fixes Issue 1882