Bug fixes: #1071272, #1071393