removed buggy shorcut