Fix loader issue, close #216