Fix for the #435