Bug Fix of 8bea8a4