[BUGFIX] #2 and #3
[BUGFIX] #2 & #3