Fixed bug after interface improvement