Issue#50 Fixed