Ok, it was my mistake. Its working now and ready to be merged.