Fix #1041 - Source formatting