Fixes Bug #1103