improve b8686be37deef7875acf622b5d968e9d18c2e5a6
#431
fix compilation #431 and b8686be37deef7875acf622b5d968e9d18c2e5a6