Fixed Redstone bug based on @Fir3will 's report