All credit goes to andyac for adding additional support.