Try to fix imported bugs