Fixed another bug in shortecodes.....fun fun fun