Fixed location bug
Fixed setting declaration locations
Merged