fixes issues from holblin