bugfix, now working wonderful