BUGS FIXED to #18