BUG FIXES: version 1.3