Bug fixes: #1328059 #1327074