Fixed issue with double __