Tested and it worked for me. 

 

Patches completely solved all FKIE issues I had.