Fixes, #2096, #1089