Is this woking for you ie, fix #27