Extension of #543

re: #543 
//cc @jagtalon