Chan bugfix