Fixed issue (#26)