Fix issue#30 -- the mijor one