Bug Fix: From can vary