Was having the same issue and it looks like its still a bug in 1.21. (Before and after screen shots below)