fixed bug in mashup