This “poor-man’s” system should address this issue. If not, it should be considered as a bug, please raise an issue!