Resolved Issues: #1148 and #1135