Temp fix for the issue#31