Bugfix140129

need to fix first commit