Some minor updates have been made searching for a possible bug