FIXED: Eventually fixed alignment issue;