Fixed Bug #25