Fixes #1194 and Fixes #1193