Fixes case #1