Trying to make it compilable for @Xyene