Fix memory issue by optional returning alignment
New states