Improved fix for 60d740a42e