Issues resolved: #1148 and #1135