Some people reported an issue with the previous fix. Here is a new fix.
@mivkov can you test it please?