Fix issues #133 #134

#####  issue #133
#####  issue #134