fix to braindead changes