fixing slight MAC issue
merged