Fixed Bug Issue 29