Fix #1265 Improvements