Fixed regression; code alignment