bugfix proper